Autogenerated HTML docs for v1.2.4-gf067
diff --git a/git-cvsimport.html b/git-cvsimport.html index 9295c05..2f22c30 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.1" /> +<meta name="generator" content="AsciiDoc 7.0.2" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -283,6 +283,11 @@ repository, or incrementally import into an existing one.</p> <p>Splitting the CVS log into patch sets is done by <em>cvsps</em>. At least version 2.1 is required.</p> +<p>You should <strong>never</strong> do any work of your own on the branches that are +created by git-cvsimport. The initial import will create and populate a +"master" branch from the CVS repository's main branch which you're free +to work with; after that, you need to <em>git merge</em> incremental imports, or +any CVS branches, yourself.</p> </div> <h2>OPTIONS</h2> <div class="sectionbody"> @@ -481,7 +486,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 16-Jan-2006 00:23:09 PDT +Last updated 08-Mar-2006 01:42:24 UTC </div> </div> </body> diff --git a/git-cvsimport.txt b/git-cvsimport.txt index dfe86ce..57027b4 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt
@@ -22,6 +22,12 @@ Splitting the CVS log into patch sets is done by 'cvsps'. At least version 2.1 is required. +You should *never* do any work of your own on the branches that are +created by git-cvsimport. The initial import will create and populate a +"master" branch from the CVS repository's main branch which you're free +to work with; after that, you need to 'git merge' incremental imports, or +any CVS branches, yourself. + OPTIONS ------- -d <CVSROOT>::
